From: Glenn Morris <rgm@gnu.org>
Date: Thu, 5 May 2011 06:25:24 +0000 (-0700)
Subject: ChangeLog merge fix, grumble.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3925
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e464f028283662726bb34b25c571240bcdccdea3;p=emacs.git

ChangeLog merge fix, grumble.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ba1884633d..9e8d6e0f283 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2011-05-05  Daniel Colascione <dan.colascione@gmail.com>
-
-	* progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
-	correct match group (bug#8438).
-
 2011-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Fix earlier half-done eieio-defmethod change (bug#8338).